Visual C++ Builds: Fix "install" Projects

Due to the split up of the property sheets, the install projects did not
have info on the Intermediate and Output Paths, which caused confusing
messages from Visual Studio to show up upon completing build+"install" and
closing Visual Studio on whether to reload the install project, at least on
Visual Studio 2008.

Also clean up the Visual Studio 2008 install project a bit.

Include the property sheet which defines these properties to fix this.

diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index 8afbb83e107511273430cd43f5c8c98ca6c21ca4..e46e41a93a5026689c0eb8feaab2826f5a86d228 100644 (file)
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -91,41 +91,49 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>

diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index e7960c945f17bec09082e53fcad9997f63820103..9a4e1a5e7e7863e717dfa268af6c35d661330f3a 100644 (file)
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -23,7 +23,7 @@
                        Name="Debug|Win32"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"\r
+                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"\r
                        CharacterSet="2"\r
                        DeleteExtensionsOnClean=""\r
                        >\r
@@ -31,21 +31,12 @@
                                Name="VCPreBuildEventTool"\r
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"\r
                        />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"\r
+                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"\r
                        CharacterSet="2"\r
                        DeleteExtensionsOnClean=""\r
                        >\r
@@ -53,22 +44,13 @@
                                Name="VCPreBuildEventTool"\r
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"\r
                        />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug_Broadway|Win32"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="10"\r
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"\r
+                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"\r
                        CharacterSet="2"\r
                        DeleteExtensionsOnClean=""\r
                        >\r
@@ -76,21 +58,12 @@
                                Name="VCPreBuildEventTool"\r
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"\r
                        />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug_Broadway|x64"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"\r
+                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"\r
                        CharacterSet="2"\r
                        DeleteExtensionsOnClean=""\r
                        >\r
@@ -98,22 +71,13 @@
                                Name="VCPreBuildEventTool"\r
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"\r
                        />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="10"\r
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"\r
+                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"\r
                        CharacterSet="2"\r
                        DeleteExtensionsOnClean=""\r
                        WholeProgramOptimization="1"\r
@@ -122,21 +86,12 @@
                                Name="VCPreBuildEventTool"\r
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"\r
                        />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"\r
+                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"\r
                        CharacterSet="2"\r
                        DeleteExtensionsOnClean=""\r
                        WholeProgramOptimization="1"\r
@@ -145,22 +100,13 @@
                                Name="VCPreBuildEventTool"\r
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"\r
                        />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release_Broadway|Win32"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="10"\r
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"\r
+                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"\r
                        CharacterSet="2"\r
                        DeleteExtensionsOnClean=""\r
                        WholeProgramOptimization="1"\r
@@ -169,21 +115,12 @@
                                Name="VCPreBuildEventTool"\r
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"\r
                        />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release_Broadway|x64"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"\r
+                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"\r
                        CharacterSet="2"\r
                        DeleteExtensionsOnClean=""\r
                        WholeProgramOptimization="1"\r
@@ -192,15 +129,6 @@
                                Name="VCPreBuildEventTool"\r
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"\r
                        />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r